projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca0f9b3 091e799)
bitkeeper revision 1.1172.1.1 (420ba344y-TLJ8cFOVA_8bN7wd3dMw)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 10 Feb 2005 18:09:08 +0000 (18:09 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 10 Feb 2005 18:09:08 +0000 (18:09 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
xen/Rules.mk patch | diff1 | diff2 | blob | history
xen/arch/x86/Makefile patch | diff1 | diff2 | blob | history
xen/arch/x86/traps.c patch | diff1 | diff2 | blob | history

diff --cc xen/Rules.mk
Simple merge
diff --cc xen/arch/x86/Makefile
Simple merge
diff --cc xen/arch/x86/traps.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.